Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 24 Feb 2024 11:35:16 +0000 (06:35 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 24 Feb 2024 11:35:16 +0000 (06:35 -0500)
01ebc95114f Fix 'help-quick-toggle'
afe49c7e2a2 ; * admin/authors.el (authors-aliases): Fix last change.
8b1f10f8cf4 ; Normalize Morgan Smith's attributions.
70cf4b694b3 ; * etc/PROBLEMS: Describe input lags due to GTK IM (bug#...
f28a557c7d4 * doc/lispref/modes.texi (Tabulated List Mode): Update.
d6131b5902a * lisp/net/tramp.el (tramp-methods): Fix typo in docstrin...
2eb85a9de1a ; * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Ano...
4c6653f23ae ; * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Doc...
5a64d2c7595 java-ts-mode: Indentation for opening brace on a separate...
9e56bd5ed87 Removed decommissioned PGP keyservers
e56f0ef51bf org: Fix security prompt for downloading remote resource
65ba3274652 Revert "Update to Org 9.6.19"
07a392f445e Update to Org 9.6.19

1  2 
.mailmap
admin/authors.el
doc/lispref/modes.texi
etc/PROBLEMS
lisp/emacs-lisp/pcase.el
lisp/help.el
lisp/net/tramp.el
lisp/org/org.el
lisp/progmodes/java-ts-mode.el

diff --cc .mailmap
Simple merge
index 6c74f4dd7a16bba10c819a30d738741d3f327730,3764c16adf0b046c060e18631fafba9f196445b1..8ea6064423f7609b80ee1769d9aba32ca1bb428e
@@@ -173,8 -195,11 +173,11 @@@ files."
      ("Michael R. Cook" "Michael Cook")
      ("Michael Sperber" "Mike Sperber" "Michael Sperber \\[Mr. Preprocessor\\]")
      ("Michalis V" "^mvar")
 -    ("Miha Rihtaršič" "Miha Rihtarsic" "miha@kamnitnik\\.top" "miha")
 +    ("Miha Rihtaršič" "Miha Rihtarsic")
      ("Mikio Nakajima" "Nakajima Mikio")
+     (nil "montag451@laposte\\.net")
+     (nil "na@aisrntairetnraoitn")
+     ("Morgan Smith" "Morgan J\\. Smith")
      ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
      ("Noah Peart" "noah\\.v\\.peart@gmail\\.com")
      ("Noorul Islam" "Noorul Islam K M")
Simple merge
diff --cc etc/PROBLEMS
Simple merge
Simple merge
diff --cc lisp/help.el
Simple merge
Simple merge
diff --cc lisp/org/org.el
Simple merge
Simple merge